*** empty log message ***

diff --git a/src/alloca.c b/src/alloca.c
index b83b35d277b839e413ca3e136b34ce4ed7e680c2..bc34529fdd296718f3768e0971a2522d646fcae0 100644 (file)
--- a/src/alloca.c
+++ b/src/alloca.c
@@ -42,10 +42,6 @@ lose
 #endif /* static */
 #endif /* emacs */
 
-#ifdef emacs
-#define free xfree
-#endif
-
 /* If your stack is a linked list of frames, you have to
    provide an "address metric" ADDRESS_FUNCTION macro.  */
 
@@ -64,8 +60,6 @@ typedef char *pointer;
 
 #define        NULL    0
 
-extern pointer xmalloc ();
-
 /* Define STACK_DIRECTION if you know the direction of stack
    growth for your system; otherwise it will be automatically
    deduced at run-time.
@@ -181,7 +175,7 @@ alloca (size)
   /* Allocate combined header + user data storage.  */
 
   {
-    register pointer new = xmalloc (sizeof (header) + size);
+    register pointer new = malloc (sizeof (header) + size);
     /* Address of header.  */
 
     ((header *) new)->h.next = last_alloca_header;

diff --git a/src/s/sco4.h b/src/s/sco4.h
index e111d977162f47047a7d6318393c0d5f584c5290..a94e27dcb519b237fa8688526bdcc2070c502c79 100644 (file)
--- a/src/s/sco4.h
+++ b/src/s/sco4.h
@@ -46,9 +46,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* SCO has bcopy, et. al.  */
 #define BSTRING
 
-/* Use both <time.h> and <sys/time.h>.  */
-#define TIME_WITH_SYS_TIME
-
 /* Sockets are an option on SCO.  If we have X, we have them.  */
 #ifdef HAVE_X_WINDOWS
 #define HAVE_SOCKETS